Skip to content

Fix a few small bugs in CFLocale #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2017
Merged

Conversation

mark1smi
Copy link
Contributor

  • Adds missing mutex unlock in an error path
  • Fixes use of an incorrect local variable
  • Addresses a few areas where _prefs member was assumed to be non-NULL
    • Fix to __CFLocaleGetMeasurementSystemGuts and __CFLocaleCopyTemperatureUnit
      modelled after __CFLocaleCopyCollatorID
    • Fix to __CFLocaleEqual handles the case where one or both CFLocales
      have NULL _prefs.

* Adds missing mutex unlock in an error path
* Fixes use of an incorrect local variable
* Addresses a few areas where _prefs member was assumed to be non-NULL
  * Fix to __CFLocaleGetMeasurementSystemGuts and __CFLocaleCopyTemperatureUnit
    modelled after __CFLocaleCopyCollatorID
  * Fix to __CFLocaleEqual handles the case where one or both CFLocales
    have NULL _prefs.
@mark1smi
Copy link
Contributor Author

@parkera Please let me know if I should stop mentioning you on these CF patches, but it seems like you're the right person for these.

@alblue
Copy link
Contributor

alblue commented Apr 13, 2017

@swift-ci please test

@parkera
Copy link
Contributor

parkera commented Apr 14, 2017

@mark1smi That's fine, thanks.

@parkera parkera merged commit 7042d36 into swiftlang:master Apr 14, 2017
@mark1smi mark1smi deleted the CFLocale_fixes branch April 14, 2017 02:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants